A couple of tweaks and fixes