Fixed some recipes and config
More update work for 1.7