Fixed some errors / Some still exist (On Windows)