Fix constraints and remove last Marvel.com label