Fixes to work with latest PMI.