Move constraints later in load order