A few fixes and clean-up.