Bug fix: Minor changes