Make changes to fix deprecated calls in Guard 2.0