Tweaked buildset