Modland indexing fixes