Heroes and items fixes