More fixes for problems on OS X 10.9