Fix some parsing issues