Misc stuff related to the 8.1 API version

These should all get into 8.1.