Multiple SDK bugs fixed