Including files for minor fixes omitted in yesterday's check-in