Change string concats to work with all OSs