Fix various issues
Fix last recipe
Merge remote-tracking branch 'origin/master'