Fix Issue: Minor changes and fix minor buddy issues