Improve keylog coverage/accuracy