Further parsing fixes