Topic

Safety Improvements

A collection of 2 issues