more fixes

Signed-off-by: Alexandr Kriptonov <alexandr.kriptonov@gmail.com>