Fixed the stuff Pippin broke.