Add systray and pertag patches