Misc minor updates and tweaks.