Fix various 20141103

OS X?