Compile fixes for revised API