Some Fixes.