Compile errors fix