Updated requirements, minor PMD fixes