minor fixes on parser and backend