Fixing some codesniffer items