Undo some incorrect changes