Some Fixes 2.0