Various java related changes, added some VC stuff.