fixing errors in subproject Sampling after big merge