2 Small fixes.
KeyboardManager done now, adds some EventBroker debugs.