Minor robustification, javadoc improvements