Bug_fixes

This doesn't compile on Windows. Make it a static variable in the .cc file and you can initialize it inline there.