More fixes for checkstyle errors