Some Fixes...