Compilation errors solved