Couple of quick changes