Some overridability improvements