Update backbone and fix incompatibilities