A couple of tweaks and fixes for v0.21.