Fix base constraints