Further bug Fixes.