More class/module mismatch fixes