Fix datastore issue & update builds