Fixing some problems in different files
Fixing some problems in different files