Fix final parser errors