Tweaks in preperation to update to the latest AngularFire