Minor clean-ups