Minor fixes
Signed-off-by:  <akorolex>