minor fixes and update IntMap from kryo