Fix to compile errors