Fixes and clean-up.