Add fixes for brew & port