Some Fixes 2