Various clean-up "fixes"