Some changes

Signed-off-by: Roman Eremeev <netconfex@gmail.com>