Fixes for compiling with VSP.