Some of the fixes in the previous commit were not pushed