Fix compile issues
Bundler for ma apis