Fixing a batch of stupid changes (not a revert)