Few String fixes