Fixes to build and run on 10.9