1.0 Conversion fixes