more fixes for fire