Re #1359 Fixing some widget wizzard problems.