small-fixes