minor fixes to scripts and checkstyle