Small bug Fixes