Fixups in response to comments