Fixes
Try to prevent datastore hits