SDK fixes