Small reverts from merge