Fix errors probably due of the sdk upgrade