More line fixes