fixes for fresh run (OS X)