Some more clean-ups