Fixed issues with skills wizard