More parsing fixes..