Fixing up the SelfHost refs