Update some stuff to get things working again