Merge changes that we misplaced