FIX: Firebase issues