More fixes to setup