Fixed some event helper and some servlet links