Minor Fixes

Some small changes