Use GlibString and fix OS X CPP issue