Fix things being moved