A few clean-ups