One more small batch of fixes and tweaks.