Fix import and Javadoc.