Fixing small changes
Fixing small changes