Fixes to last commit broke everything