Some more safeguards