small fixes that correspond to SDK 0.3.5