Fixed some relogging issues in firebase