Fixed SDK issues