CS fixes suggested by fabbot