Last few conversion fixes.