Bug fixes and recipe changes