Fixes for UI and events