Checkstyle fixes introduced during last batch of changes