Bug fixes

Fixed a npe in fire class