MADS: Fix hotspot loading, and a couple of other warnings