cover fixes and checkstyle