More fixes for globalauth