Some clean-ups...