More prepping for 1.8. :p