Fix issues with checkstyle task

Fixed issues with checkstyle task found by Matt