Fix order of constraints, fix literal format