Added fixes and improvements needed for gvNIX 1.3.0.