Fix minor EBN issues

Authored by yurchor on Feb 21 2020, 6:17 PM.