Make some type changes based on rods feedback.