fix: mac fixes