Backport two conversion fixes from 1.40