Changes and dist.init cleanup