Current fixes and clean-ups.