Updated checkstyle and build errors