Fix some Minor derps with battery