fireinfo: Import latest fixes for ARM