Some additional safeties