Fix or commenting out compilation errors