Fixed the compile time errors