Fixes for key handlers and drag