Some more UA fixes (this time Windows specific)