Fix and cleanup wizard. fix #1324