Bvt fixes30072013

Bad Merge Fixes