more build tweaks to minimize manual edits