Fix @safe etc