fixed firebase calls