Fix up stuff.