Fixes for system tray