sanitycheck fixes