Backbone test issues

Fixes as a result of backbone parity testing.