Some Thymeleaf fixes.