Fixes for the setup files.