E0d/xqwatcher fixes