some fixes on bench