Revert com changes and some other missed changes