WIP - Temp fixes for brew