Implementing some more UnsafeStubs stubs, minor tweaks