Fixes to SETUP