Moar fixes to strings before 2.0.1