Firebase Push Fixes