Fixes to physical constraint handling