Fixing a few things