Revert some mistakes