Various changes with firebase