Remove some of the unsafety again