More Stargazer fixes