Make 1.8 compatible.
Hopefully.