Fix up checkstyle and warnings that have crept back into the build....