Chris Heald:
	- Fixes for 7.1 deprecations
