Changed some files for some problems