Safety enhancements