Attempt to fix parser compilation errors after rebase