Tweaks & bugfix

This teaks a few things, adds a very important TODO (active mutations
are Exploitable without it) and fixes #8959.