Small edits to Cisternstorage