Minor modifications on various files