Flower pot and more fire fixes