few-small-fixes