Fixing two small bugs
Fixing a few bugs