hercules: Misc updates