Add more extra guards.