Fixed OAuth issues