Easy compile error conversions done

Only two compile errors left