Fixes for regressions introduced by the Librato/multi-backend changes

A work in progress, I'll thoroughly test these fixes first, but wanted to throw them out there for discussion.