Bug fixes and recipe cleanup for MWC deployment