Few Bug Fixes