diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -181,11 +181,6 @@ void finish_frame(struct distrenjob *hea
   distrenjob->assigned_frames--;
   general_info.total_frames_rendered++; // Increase total frames var for stats
 
-  if(distrenjob->completed_frames == distrenjob->total_frames)
-    {
-      mortition(head, distrenjob);
-    }
-
   updateGeneralInfo();
   updateJobStatsXML(distrenjob);
 }
@@ -352,7 +347,7 @@ void change_job_priority(struct distrenj
     // iterate through linked list of jobs
     for(current_job = head; current_job != NULL; current_job = current_job->next){
       if(current_job == NULL){ // if it has reached the end of the list, add job there
-        current_job = job;
+        prev_job->next = job;
         break;
       }
       else if(job->priority <= current_job->priority){ // if job's priority is less than or equal to current_job's priority, insert job
@@ -380,12 +375,10 @@ int find_jobframe(struct distrenjob *hea
     return 1;
 
   unsigned int frame_counter;
-  short int your_job_type;
   unsigned short int found;
 
   struct distrenjob *distrenjob_ptr;
 
-  your_job_type = 0;
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = head->next; distrenjob_ptr && !distrenjob_ptr->hibernate; distrenjob_ptr = distrenjob_ptr->next)
@@ -395,7 +388,6 @@ int find_jobframe(struct distrenjob *hea
       if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED) // jobframe found
       {
     	found = 1;
-    	your_job_type = distrenjob_ptr->type;
     	distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
     	distrenjob_ptr->frameset[frame_counter].start_time = clock();
     	distrenjob_ptr->assigned_frames++;