More Fire Fixes