Compile fixes for new API.
Compile fixes for new API.