Fixes for _.cluster.*