Some more safety bits