Minor corrections to parser