Fix parsing issues with statements