Overindulgence fixes