Resolve compilation errors