Make build robust