Fix to the OSX path and capture stuff as well as a few other fixes