#228: Setup fixes