Fixes to setup.