Small conversion fixes.