Fixups based on @cantino 's comments