More fixup of the brew detection