Fix systray issues