Some Fixes 1