Small changes to make less datastore calls.