[minor] fixes against 0.9