More String fixes