more data safety tweaks