In attempting to make fixes, broke more stuff