Defoxing fixes