Code

Fix a few remaining oddities in handle scaling via keyboard