last batches of fixes for this week