Updated to latest common build scripts