Address problems with constraints reported in #1060 and #1064