Changes are needed in fire marshal’s office