Make setup work again under unix