Add several fixes related to compatibility with conkit