* Some Fixes