fix: some problems