missing xhook fixes from last release :O