Some XeTeX fixes

But XeLaTeX just drops all class options for some reason. Bug?