Improvements to existing constraints