More small changes to match jE+ project.