Fix few issue with title handling
Update build