Minor fixes to remove unneeded constraints