more hero fixes