Fixups and remaining recipes