Title fixes and tweaks