Qualifications - minor bug fixes and cleanup.