hercules: Initial fix-up for Candy 5.
8 files changed