Fixed import error and two checkstyle issues