Fixes to get bulk PMC to run