Various Fixes
Merge branch 'master' of github.com:pierrebeaucamp/random-recipe