Fix more things broken by UnAttach refactorign