Fix rest of mess issues (nw)