Small clean ups.