Fix PanelXta and QuickZap