Bugfixes for firebase store