Minor fixups to last commit