Some Fixes
Update