Fix issues caused by OpenAuth