minor parsing fixes