Various fire changes/additions