bug fixes in SDK