Minor changes and tweaks.