Fixed line issues, fixed build issue