Fixing a few things
Fixing a few things