[WIP] Working on installation improvements (OS X)