A couple of small tweaks