More parsing fixes