Fixed rest of issues preventing recipe from completing successfully