ogsl/rebuild/xmd minor fixes