Two small sdk fixes

see commits