Bug fixes to ensure cluster recipe operates