Revert warning fixes