Fix issue with minor and no key analysis