Fixes from emails for Eric.