Fix rest of breakage