fix: small issues
6 files changed