FIX pmd & cs errors