Update some stuff to 1.8