OO section fixes