Fix bench scripts and makefile