Compatibility-checker tweaks