small fixes for issues found