Minor checkstyle related fixes