Fixes to wizard cosmetics