Tweaking build config to get the build going