Fixes to setup