Modefy some bugs