Safety chip tweaks