Hero displaying fixes