MAVLauncher - various small fixes, inclduing nonstandard ACM branches