Some spawner finder enhancements