Comply with benchmark suite and make things faster