Tweaks for testing the new cookware

Now need to go into master