Bug Fixes set 2