A couple of unrelated commits

Review please.