Fix Some little bugs