SomeFixes

Some Initial Fixes