Last small fixes to conversion scripts.