Minor tweaks to Build and Run config.