Fixed issues with scripts that prevents building without .m2 setup