Added some 1.7 API updates that were missing from 1.8

Addresses d2d8a4a6c507bc8e7d591925276d79d89ce6beaf, bf17383e35afa12f5d6cb145b26542f2dc4f95de and b9ad0c9 specifically.