Small changes after a short code review of the mixing code