Fixes for Jeffs comments, trying again.