Use new lib-grimoire version
Fix some dumb intermediary errors