A few fixes and tweaks.