Last fixes

Signed-off-by: Rafał Malinowski <rafal.malinowski@corp.bluecherry.net>