Add missing types, to compile with no implicit any