Fix up stuff