Tidy up conversion artifacts