OAuth Server and Client fixes