A few minor safeguards