Fix wizard

For #961, #990 (raster and point), #980, #979, #977, #953, #988, #993.
Tested under Ubuntu 12.04