Minor build updates