diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c
index abc4bab16..6072238a7 100644
--- a/camlibs/konica/library.c
+++ b/camlibs/konica/library.c
@@ -200,7 +200,7 @@ camera_init (Camera* camera, CameraInit* init)
 	for (i = 0; i < 2; i++) {
 		for (j = 0; ; j++) {
 			if (models[i][j] == NULL) break;
-			if (strcmp (models[i][j], init->model) == 0) {
+			if (strcmp (models[i][j], camera->model) == 0) {
 				if (i == 1) konica_data->image_id_long = TRUE;
 				break;
 			}
diff --git a/camlibs/panasonic/dc1000.c b/camlibs/panasonic/dc1000.c
index 8dc243661..329c3445b 100644
--- a/camlibs/panasonic/dc1000.c
+++ b/camlibs/panasonic/dc1000.c
@@ -350,7 +350,7 @@ int camera_init (Camera *camera, CameraInit *init) {
 	
 	dsc_t		*dsc = NULL;
 	
-	dsc_print_status(camera, "Initializing camera %s", init->model);	
+	dsc_print_status(camera, "Initializing camera %s", camera->model);	
 
 	/* First, set up all the function pointers */
 	camera->functions->id 			= camera_id;
diff --git a/camlibs/template/template.c b/camlibs/template/template.c
index d50ec4270..a369f44de 100644
--- a/camlibs/template/template.c
+++ b/camlibs/template/template.c
@@ -32,27 +32,27 @@ int camera_abilities (CameraAbilitiesList *list) {
 int camera_init (Camera *camera, CameraInit *init) {
 
 	/* First, set up all the function pointers */
-	camera->functions->id 		= camera_id;
-	camera->functions->abilities 	= camera_abilities;
-	camera->functions->init 	= camera_init;
-	camera->functions->exit 	= camera_exit;
-	camera->functions->folder_list  = camera_folder_list;
-	camera->functions->file_list	= camera_file_list;
-	camera->functions->file_get 	= camera_file_get;
-	camera->functions->file_get_preview =  camera_file_get_preview;
-	camera->functions->file_put 	= camera_file_put;
-	camera->functions->file_delete 	= camera_file_delete;
-	camera->functions->config_get   = camera_config_get;
-	camera->functions->config_set   = camera_config_set;
-	camera->functions->folder_config_get = camera_folder_config_get;
-	camera->functions->folder_config_set = camera_folder_config_set;
-	camera->functions->file_config_get = camera_file_config_get;
-	camera->functions->file_config_set = camera_file_config_set;
-	camera->functions->capture 	= camera_capture;
-	camera->functions->summary	= camera_summary;
-	camera->functions->manual 	= camera_manual;
-	camera->functions->about 	= camera_about;
-	camera->functions->result_as_string = camera_result_as_string;
+	camera->functions->id 			= camera_id;
+	camera->functions->abilities 		= camera_abilities;
+	camera->functions->init 		= camera_init;
+	camera->functions->exit 		= camera_exit;
+	camera->functions->folder_list  	= camera_folder_list;
+	camera->functions->file_list		= camera_file_list;
+	camera->functions->file_get 		= camera_file_get;
+	camera->functions->file_get_preview 	=  camera_file_get_preview;
+	camera->functions->file_put 		= camera_file_put;
+	camera->functions->file_delete 		= camera_file_delete;
+	camera->functions->config_get   	= camera_config_get;
+	camera->functions->config_set   	= camera_config_set;
+	camera->functions->folder_config_get 	= camera_folder_config_get;
+	camera->functions->folder_config_set 	= camera_folder_config_set;
+	camera->functions->file_config_get 	= camera_file_config_get;
+	camera->functions->file_config_set 	= camera_file_config_set;
+	camera->functions->capture 		= camera_capture;
+	camera->functions->summary		= camera_summary;
+	camera->functions->manual 		= camera_manual;
+	camera->functions->about 		= camera_about;
+	camera->functions->result_as_string 	= camera_result_as_string;
 
 	return (GP_OK);
 }