Fixes for new versions of some of the requirements.