Fix some errors in new rewriting integration
Merge branch 'master' of https://github.com/FreederTeam/Freeder