Some more updates for Moppy h/w replacement.