Linux (and Mac OS X?) fixes;