Fix constraint warnings