Fix parsing issues