A couple of handler tweaks