Updates and clean-ups