Fix some issues with rebinding prefix key