Backbone.State fixes