Minor changes & Bug fixes