Fixes for XAUTH-113