Final title fixes