Fixed Fire API bugs that stop page loading