A couple of quick tweaks