Fix postrm and control