Fixed some stuffs...