Fixed tiny defects