Improvements to check_requirements