fixes of some stuffs