Changes to a few things