Improved ivset/ivget (revert?)