Fix some title bugs
Merge master