Fixed more SDK issues