Top-level build target fixes