Minor bug Fixes