Fixed some bugs in launch files