Fixed other compile-time errors