more conversion error fixes
These are compiler error fixes and not the required manual conversions (those to come).