Fixes to worker selection strategies