more conversions, fix so all classes now compile