Multiple bug Fixes