Just fixing a few things