Some fixes for checkstyle