Minor hero fixes.
More minor hero fixes.