fix some struts bugs