Further fixes spawn management