Fix a few of the earlier changes to os_forbid