contributor: some fixes