Trimming strings + build number change