merge toolkit recipe fixes