Fix parse issues