profiler safety enhancements