Fixes for JDoc and hashmaps