3.0 fixes for pdf builds
3.0 more xrefs clean up.