MADS: Fixes for giving batteries to Hermin