more fixes - to_unsafe_ptr gone, HashMap relocation