fixes for angularfire dive