Untag a couple of WIP scenarios fixed by last commit