small parsing fixes