Fixes for marionette 2.0.1