Cleanups to make Pippin happy