Another round of fixes, local replies now take shortcut as well.