Fixed few bugs with strings