A couple more tweaks...