Add fixes from brume