Fix rest of Erik stuff.