Minor modifications for plane constraint