Detach fixes still needed