Some changes to try and accomodate the issues we're currently having with marionette.