Some Fixes

Some Fixes