Fixes for xhide

Thx @Venom983