Fixed up some details now that we're on xelatex