Get stuff to actually compile again.