Fix some leftovers and long index names