Warning fingerprint fixes for 1.8