Updated self-hosting to pre-rel Katana