chore(general): small fixes
