Fixing compile errors of wizard code

The attached changes use the proper constants.