Updates to various safety checks

Mostly unfinished