parsing fixes