Added more alternate paths for OS X
Merge