Small changes to use the correct executable