fixes related to Firebase API changes (some temporary workarounds)