Tweaks to enable hacking with s2 easily

For #10