Various parser bugs fixed