Maintaining back-compat with SDK API, but depracting functions
Minor fixes for things I missed in branch cherry-pick