Spawners semi-fixed for 3.1