Added some 1.7 API updates that were missing from 1.8