Fix line issues