Further conversion improvements #620 #626