Minor fixes for warnings, imports, and javadoc.