compatcheck fixes