fixed issues that came with upgrading marionette and friends