A couple more tweaks