fix: minor improvements