Sauce and fixes