Minor fixups to previous commit