fix a some problems