Minor build improvements