Incorporate David's minor wallis fixes