Fix recipe and add fix for battery boxes