Improve requirements checks