fix unsafe
fix std imports