[c2413] Fix some warnings
[c2414] Fix VMAP model extraction issues