Auto detect fixes