More bugfixes for warrick integration.