Various clean-up