Finish porting KAuth changes