Fixes for compat with latest polyproj
Fixes for working with latest polyproj branch.