Recipe Fixes and Bugfixes