Update dirty check to 1.8+