Tweaks to work with Uncontext