Bug List Fixes for Nidhesh