Minot improvements

Signed-off-by:  <akorolex>