More fixes and tweaks.