Add -safe switch to update-package
remove hacky type