Minor bug fixes.
Merge branch 'hero'