Resolved compilation errors