Safety and security enhancements