Adjustments to conversion stuff, to allow for where exceptions should occur