Recipe/misc fixes