small constraints tweaks