firebase bug fixes