Flux, fire and dirt fixed up