Last round of changes for cert based auth