Fix for batteries and carbon sink

Hello,
I managed to get batteries fixed as well and have uploaded a patch for this. This patch also fixes an issue with the carbon sink building.