Fix building cmw recovery