fixes for latest SDK: 0.4.5+1