Fix the binary name + other improvements