Partially fix unicode handling. Spring pattern is still broken.