Fixes mainly for using correct broker base url and other build related fixes