Fix minor EBN issues

Authored by yurchor on Sep 12 2018, 5:49 PM.