Fix build after battery merge