Update for 1.8 compatibility

Yay!