Forgot these two changes.