Some various cleanup items.