Various clean-up and updates