Small modifications in launch files and Makefile