More title fixes