Fix possible compilation errors