Incremental parsing fixes