Fixes (plus a new recipe under development ...)