Some Fixes....