More marionette 2.0 fixes