clustering fixes