bug fixes for parsing 2.0 syntax