more keyboard eventflow fixes