Fixes for checkstyle