Fixes to work with the latest trunk-polyproj branch at mattam82/coq