Bug Fixes as discussed