More conversion cleanup stuff