Revert fixes