Some Fixes
Some Fixes