KeyBox fixes & tweaks