minor-fixes

minor-fixes