Fix minor EBN issues

Authored by yurchor on Sep 2 2018, 8:22 AM.