Fixing compile time errors