A few more fixes oauth