Various SDK fixes