Fix up some issues.