Updates to fix comments where email address is not available