Fixed the unsafe calls.