Contract section fixes