Fix minor EBN issues and typos

Authored by yurchor on Oct 9 2018, 8:27 AM.