Fix up somethings.