Add fixes on the fly