Cleanup and recipe tweaks