Experimental fixes

Fix some issues with the experimental parser