Add several fixes related to compatibility with conkit
This tag has no release notes.