minor fixes for SDK