ngfire upgrade fixes