Added other changes missed from prior commits