Final tweaks to 'check_mode'