Fixed more compile time errors