Update brew installation
Various fix ups after new install