Parser bugs fixed