Fix up things