A couple other small changes