Fix javadoc and serialization stuff