A couple other changes