Fixes for a variety of refactor issues, particularly Backbone support