safety tweaks