fix miscs issues