More updates to CheckState_NV