updates to address changes in the 0.8.5.0 sdk

@keertip, Fix some issues with the latest (0.8.5.0) sdk. I won't land this until after 0.8.5 is released -