Fix line bugs