Update versions, switch to catamorphic's codeq fork