Merge stuff from my FireBurn overlay fork