More of the same
forgot 1 file
Fix some modules build
Disable Carla build, instead print warning to use stable branch