Fix-ups and whatnot.