minor parsing bug fixes