More parsing fixes...