sdk rc fixes