Fixes following upgrade to Jackson in ISIS-959.