Various fixes to cover for Marionette issues.