Bug Fixes for Report