- Fix VIMAGE build.
- Fix build with gcc.