Fix some import/javadoc