Small fixes and tweaks.