Fixed some title corner cases