Minor build edits