sdk fixes