Fixed some stuffs