Fix/annotate a variety of xfails