Another round of quick changes