Fixed critical PMD warnings