recovery: fix derp and update module classes