Misc interface cleanup and constraints fixes