Minor fixes and tweaks.