Hero creation fixes