Handle a couple of issues from DATASTORE rename