Fixed issues with keyboard proxy