Fixed some issues with Jackson.