#228: setup fixes