Tweaking build again