Adding a couple conversions to facilitate transition.