Fixes for backbone 1.0 compatibility