More bug Fixes