Minor modifications
Quick fix