Fix the checkstyle problems - regressed since originally addressed!