Checkstyle and cover fixes