Fixing a few things behind the scenes.