Fix minor issues found by EBN

Authored by yurchor on Oct 28 2019, 2:33 PM.