Fixed some more Firebase stuff