Edited some files for compability