Correction of 2 previous known bugs