More constraints to please travis