Improved requirements checks