Various XTS failures (master)