fix: minor stuff from master