Changes to a few more places