Fixes needed to work with datastore without datastore :)