Index long line fixes