Small clean-ups